Check for cairo-pdf.h. Check for cairo-ps.h on non-win32.

2006-04-24  Alexander Larsson  <alexl@redhat.com>

	* configure.in:
	Check for cairo-pdf.h.
	Check for cairo-ps.h on non-win32.

diff --git a/ChangeLog b/ChangeLog
index 405c27f6f45d8519335750a1508149c3a32bbae6..279837cf8805ac4500279363e63e653a644b7937 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-24  Alexander Larsson  <alexl@redhat.com>
+
+       * configure.in:
+       Check for cairo-pdf.h.
+       Check for cairo-ps.h on non-win32.
+
 2006-04-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 405c27f6f45d8519335750a1508149c3a32bbae6..279837cf8805ac4500279363e63e653a644b7937 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-24  Alexander Larsson  <alexl@redhat.com>
+
+       * configure.in:
+       Check for cairo-pdf.h.
+       Check for cairo-ps.h on non-win32.
+
 2006-04-24  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkclipboard.h: 

diff --git a/configure.in b/configure.in
index 83b44fe756c62b43a0bddbb1e789c77c15350987..857bf9d53d5b0c7d944c4cdc08d5565ba8f5a1a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1549,7 +1549,22 @@ if test "x$CUPS_CONFIG" != "xno"; then
 fi
 AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
 
-       
+gtk_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
+                         
+AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
+*** Can't find cairo-pdf.h. You must build Cairo with the pdf
+*** backend enabled.]))
+
+if test "$os_win32" != "yes"; then
+  AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
+*** Can't find cairo-ps.h. You must build Cairo with the 
+*** postscript backend enabled.]))
+fi   
+
+CPPFLAGS="$gtk_save_cppflags"
+     
+                               
 ################################################################
 # Strip -export-dynamic from the link lines of various libraries
 ################################################################